modules/input/gtkimcontextime.h modules/input/gtkimcontextmultipress.h

2008-05-28  Michael Natterer  <mitch@imendio.com>

	* modules/input/gtkimcontextime.h
	* modules/input/gtkimcontextmultipress.h
	* modules/input/gtkimcontextthai.h
	* modules/input/gtkimcontextxim.h: include <gtk/gtk.h> instead of
	individual files.

	* modules/input/gtkimcontextime.c
	* modules/input/gtkimcontextmultipress.c
	* modules/input/gtkimcontextxim.c
	* modules/input/imam-et.c
	* modules/input/imcedilla.c
	* modules/input/imcyrillic-translit.c
	* modules/input/iminuktitut.c
	* modules/input/imipa.c
	* modules/input/imti-er.c
	* modules/input/imti-et.c
	* modules/input/imviqr.c: ditto. Some minor cleanups like moving
	"gtk/gtkintl.h" to the end of includes.

svn path=/trunk/; revision=20200

diff --git a/ChangeLog b/ChangeLog
index 03e42cec6c906059687c5218856195050ae47cd1..8e8f14dc1ba2131ba9cbe55556cd601984b39b4d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2008-05-28  Michael Natterer  <mitch@imendio.com>
+
+       * modules/input/gtkimcontextime.h
+       * modules/input/gtkimcontextmultipress.h
+       * modules/input/gtkimcontextthai.h
+       * modules/input/gtkimcontextxim.h: include <gtk/gtk.h> instead of
+       individual files.
+
+       * modules/input/gtkimcontextime.c
+       * modules/input/gtkimcontextmultipress.c
+       * modules/input/gtkimcontextxim.c
+       * modules/input/imam-et.c
+       * modules/input/imcedilla.c
+       * modules/input/imcyrillic-translit.c
+       * modules/input/iminuktitut.c
+       * modules/input/imipa.c
+       * modules/input/imti-er.c
+       * modules/input/imti-et.c
+       * modules/input/imviqr.c: ditto. Some minor cleanups like moving
+       "gtk/gtkintl.h" to the end of includes.
+
 2008-05-28  Michael Natterer  <mitch@imendio.com>
 
        * modules/engines/pixbuf/pixbuf-style.h

diff --git a/modules/input/gtkimcontextime.c b/modules/input/gtkimcontextime.c
index 4a31063c22cf818c0f4fa90a12a16eeda151e4f8..c2a87d9f9f50a9890ebbe28711b6e73636208bc8 100644 (file)
--- a/modules/input/gtkimcontextime.c
+++ b/modules/input/gtkimcontextime.c
@@ -31,7 +31,6 @@
 
 #include "gdk/win32/gdkwin32.h"
 #include "gdk/gdkkeysyms.h"
-#include "gtk/gtkwidget.h"
 
 #include <pango/pango.h>
 

diff --git a/modules/input/gtkimcontextime.h b/modules/input/gtkimcontextime.h
index e4d97d926597947b787638eefe0fd323c94d8102..638c11cfb8cf2c5f1724e2fa6a09e009f13f6dfb 100644 (file)
--- a/modules/input/gtkimcontextime.h
+++ b/modules/input/gtkimcontextime.h
@@ -21,7 +21,7 @@
  * $Id$
  */
 
-#include <gtk/gtkimcontext.h>
+#include <gtk/gtk.h>
 
 extern GType gtk_type_im_context_ime;
 

diff --git a/modules/input/gtkimcontextmultipress.c b/modules/input/gtkimcontextmultipress.c
index c09bb0857c9c99e828e566ef8a610c48eb0ab95f..427deed72b2016ba8666cb66de3f1471352152e7 100644 (file)
--- a/modules/input/gtkimcontextmultipress.c
+++ b/modules/input/gtkimcontextmultipress.c
@@ -16,17 +16,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
+
+#include <string.h>
+
+#include "gtk/gtk.h"
+#include "gdk/gdkkeysyms.h"
+
+#include "gtk/gtkimmodule.h"
 #include "gtkimcontextmultipress.h"
-#include <gtk/gtkimcontext.h>
-#include <gtk/gtkimmodule.h>
-#include <gtk/gtkimcontext.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gdk/gdkwindow.h>
-#include <gdk/gdkkeysyms.h> /* For GDK_A, etc. */
-#include <glib.h> /* For GKeyFile */
-#include <glib-object.h>
-#include <string.h> /* For memset() */
 
 #define AUTOMATIC_COMPOSE_TIMEOUT 1 /* seconds */
 

diff --git a/modules/input/gtkimcontextmultipress.h b/modules/input/gtkimcontextmultipress.h
index a7d94d9f66298671e40af49340a70c8beb4a9142..aa564a22e9db952d61524f627e4d27d8474a5c6e 100644 (file)
--- a/modules/input/gtkimcontextmultipress.h
+++ b/modules/input/gtkimcontextmultipress.h
@@ -19,7 +19,7 @@
 #ifndef __GTK_IM_CONTEXT_MULTIPRESS_H
 #define __GTK_IM_CONTEXT_MULTIPRESS_H
 
-#include <gtk/gtkimcontext.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/modules/input/gtkimcontextthai.h b/modules/input/gtkimcontextthai.h
index 06b37f015f111cab94a0aff4d33cd18297bb0da6..bb5faee5094541a914b0f0597e67cb29dabab0fb 100644 (file)
--- a/modules/input/gtkimcontextthai.h
+++ b/modules/input/gtkimcontextthai.h
@@ -22,7 +22,7 @@
 #ifndef __GTK_IM_CONTEXT_THAI_H__
 #define __GTK_IM_CONTEXT_THAI_H__
 
-#include <gtk/gtkimcontext.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c
index 7cd0b2ea7fbf754a69dbb906b40f1500ee709fb7..22db5cfe2ec309ac33984ff6de00719b3e7e1db7 100644 (file)
--- a/modules/input/gtkimcontextxim.c
+++ b/modules/input/gtkimcontextxim.c
@@ -22,12 +22,10 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "gtk/gtkintl.h"
-#include "gtk/gtklabel.h"
-#include "gtk/gtksignal.h"
-#include "gtk/gtkwindow.h"
 #include "gtkimcontextxim.h"
 
+#include "gtk/gtkintl.h"
+
 typedef struct _StatusWindow StatusWindow;
 typedef struct _GtkXIMInfo GtkXIMInfo;
 

diff --git a/modules/input/gtkimcontextxim.h b/modules/input/gtkimcontextxim.h
index 685b3944437d8c689d440196ae7e4e1b2a50fa36..36c77cd2ef68396e065eda587b5ac290b4809cea 100644 (file)
--- a/modules/input/gtkimcontextxim.h
+++ b/modules/input/gtkimcontextxim.h
@@ -20,7 +20,7 @@
 #ifndef __GTK_IM_CONTEXT_XIM_H__
 #define __GTK_IM_CONTEXT_XIM_H__
 
-#include <gtk/gtkimcontext.h>
+#include <gtk/gtk.h>
 #include "x11/gdkx.h"
 
 G_BEGIN_DECLS

diff --git a/modules/input/imam-et.c b/modules/input/imam-et.c
index 5ba271e703bbcaef38312b6f8b9f40d4d63f5d9d..cf5f50dcc09092b85e16f1a461ed3d5782a3aad0 100644 (file)
--- a/modules/input/imam-et.c
+++ b/modules/input/imam-et.c
@@ -29,11 +29,11 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "gtk/gtkintl.h"
-#include "gtk/gtkimcontextsimple.h"
 #include "gtk/gtkimmodule.h"
+#include "gtk/gtkintl.h"
 
 GType type_am_et_translit = 0;
 

diff --git a/modules/input/imcedilla.c b/modules/input/imcedilla.c
index c74ba68f64ee687b2070435281acc0e97f148b74..1a31fe6018a0f9800af9a91d373059232d22c8dd 100644 (file)
--- a/modules/input/imcedilla.c
+++ b/modules/input/imcedilla.c
@@ -23,11 +23,12 @@
 #include <config.h>
 #include <string.h>
 
-#include <gdk/gdkkeysyms.h>
+#include "gtk/gtk.h"
+#include "gdk/gdkkeysyms.h"
 
-#include "gtk/gtkintl.h"
-#include "gtk/gtkimcontextsimple.h"
 #include "gtk/gtkimmodule.h"
+#include "gtk/gtkintl.h"
+
 
 GType type_cedilla = 0;
 

diff --git a/modules/input/imcyrillic-translit.c b/modules/input/imcyrillic-translit.c
index cf7fdb595e0e656d627fcd73a4a970be36729282..c9014c712eaf4d4c247b93ba13fce79ca1ff10cc 100644 (file)
--- a/modules/input/imcyrillic-translit.c
+++ b/modules/input/imcyrillic-translit.c
@@ -23,11 +23,11 @@
 #include <config.h>
 #include <string.h>
 
-#include <gdk/gdkkeysyms.h>
+#include "gtk/gtk.h"
+#include "gdk/gdkkeysyms.h"
 
-#include "gtk/gtkintl.h"
-#include "gtk/gtkimcontextsimple.h"
 #include "gtk/gtkimmodule.h"
+#include "gtk/gtkintl.h"
 
 GType type_cyrillic_translit = 0;
 

diff --git a/modules/input/iminuktitut.c b/modules/input/iminuktitut.c
index 2311936f632f47bf3381be0231838e86b3f740e1..c13eb064331671fe3fe1a3acd836438933104b2f 100644 (file)
--- a/modules/input/iminuktitut.c
+++ b/modules/input/iminuktitut.c
@@ -26,11 +26,11 @@
 #include <config.h>
 #include <string.h>
 
-#include <gdk/gdkkeysyms.h>
+#include "gtk/gtk.h"
+#include "gdk/gdkkeysyms.h"
 
-#include "gtk/gtkintl.h"
-#include "gtk/gtkimcontextsimple.h"
 #include "gtk/gtkimmodule.h"
+#include "gtk/gtkintl.h"
 
 GType type_inuktitut_translit = 0;
 

diff --git a/modules/input/imipa.c b/modules/input/imipa.c
index 10d944dd5d26e76c1f8f4bacc750e491c95a4e75..3f44aeb19058e435c247c69f869a245ca59dbfb0 100644 (file)
--- a/modules/input/imipa.c
+++ b/modules/input/imipa.c
@@ -23,11 +23,11 @@
 #include <config.h>
 #include <string.h>
 
-#include <gdk/gdkkeysyms.h>
+#include "gtk/gtk.h"
+#include "gdk/gdkkeysyms.h"
 
-#include "gtk/gtkintl.h"
-#include "gtk/gtkimcontextsimple.h"
 #include "gtk/gtkimmodule.h"
+#include "gtk/gtkintl.h"
 
 GType type_ipa = 0;
 

diff --git a/modules/input/imti-er.c b/modules/input/imti-er.c
index c00350c7b185eeb838bfdcf65837a297e4451e8e..42837f25357814962dadb0146689e38e67b94703 100644 (file)
--- a/modules/input/imti-er.c
+++ b/modules/input/imti-er.c
@@ -29,11 +29,11 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <gdk/gdkkeysyms.h>
+#include "gtk/gtk.h"
+#include "gdk/gdkkeysyms.h"
 
-#include "gtk/gtkintl.h"
-#include "gtk/gtkimcontextsimple.h"
 #include "gtk/gtkimmodule.h"
+#include "gtk/gtkintl.h"
 
 GType type_ti_er_translit = 0;
 

diff --git a/modules/input/imti-et.c b/modules/input/imti-et.c
index b4bd2001cb151cf5ae6884cc0ce35b52e97044da..49bf8759c4e81ef1c901862fce46f03d69f7c033 100644 (file)
--- a/modules/input/imti-et.c
+++ b/modules/input/imti-et.c
@@ -29,11 +29,11 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <gdk/gdkkeysyms.h>
+#include "gtk/gtk.h"
+#include "gdk/gdkkeysyms.h"
 
-#include "gtk/gtkintl.h"
-#include "gtk/gtkimcontextsimple.h"
 #include "gtk/gtkimmodule.h"
+#include "gtk/gtkintl.h"
 
 GType type_ti_et_translit = 0;
 

diff --git a/modules/input/imviqr.c b/modules/input/imviqr.c
index 20f4d99db2dfe39e9f971cff3112206ab90cde18..b4f775fe954df026ac59fed60eccdb624b2a3005 100644 (file)
--- a/modules/input/imviqr.c
+++ b/modules/input/imviqr.c
@@ -26,11 +26,11 @@
 #include <config.h>
 #include <string.h>
 
-#include <gdk/gdkkeysyms.h>
+#include "gtk/gtk.h"
+#include "gdk/gdkkeysyms.h"
 
-#include "gtk/gtkintl.h"
-#include "gtk/gtkimcontextsimple.h"
 #include "gtk/gtkimmodule.h"
+#include "gtk/gtkintl.h"
 
 GType type_viqr_translit = 0;